bitkeeper revision 1.1609 (429c6790TWBysBM5eFTwmssbNmB69g)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

diff --cc tools/python/xen/xend/XendRoot.py
index ac2eff981d9032ea11b3735588b947e0eb66b939,5623381f1dbe385572f35a861c6b67aa5a74cae8..069f21dc9ff128480987863c801ae1410d49801f
--- 1/tools/python/xen/xend/XendRoot.py
--- 2/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@@ -43,11 -42,9 +43,12 @@@ class XendRoot
      """Default path to the log file. """
      logfile_default = "/var/log/xend.log"
  
+     """Default level of information to be logged."""
      loglevel_default = 'DEBUG'
  
 +    """Default for the flag indicating whether xend should run an http server."""
 +    xend_http_server_default = 'no'
 +
      """Default interface address xend listens at. """
      xend_address_default      = ''
  
@@@ -63,17 -54,8 +64,17 @@@
      """Default port xend serves events at. """
      xend_event_port_default   = '8001'
  
 -    """Default inteface address xend listens at for consoles."""
 +    """Default port xend serves relocation at. """
 +    xend_relocation_port_default = '8002'
 +
 +    """Default for the flag indicating whether xend should run a unix-domain server."""
 +    xend_unix_server_default = 'yes'
 +
 +    """Default path the unix-domain server listens at."""
 +    xend_unix_path_default = '/var/lib/xend/xend-socket'
 +
 +    """Default interface address xend listens at for consoles."""
-     console_address_default   = ''
+     console_address_default   = 'localhost'
  
      """Default port xend serves consoles at. """
      console_port_base_default = '9600'
@@@ -286,29 -237,11 +287,29 @@@
          """
          return self.get_config_value('xend-address', self.xend_address_default)
  
 +    def get_xend_relocation_address(self):
 +        """Get the address xend listens at for its HTTP and event ports.
 +        This defaults to the empty string which allows all hosts to connect.
 +        If this is set to 'localhost' only the localhost will be able to connect
 +        to the HTTP and event ports.
 +        """
 +        return self.get_config_value('xend-relocation-address', self.xend_relocation_address_default)
 +
 +    def get_xend_unix_server(self):
 +        """Get the flag indicating whether xend should run a unix-domain server.
 +        """
 +        return self.get_config_bool("xend-unix-server", self.xend_unix_server_default)
 +
 +    def get_xend_unix_path(self):
 +        """Get the path the xend unix-domain server listens at.
 +        """
 +        return self.get_config_value("xend-unix-path", self.xend_unix_path_default)
 +
      def get_console_address(self):
          """Get the address xend listens at for its console ports.
-         This defaults to the empty string which allows all hosts to connect.
-         If this is set to 'localhost' only the localhost will be able to connect
-         to the console ports.
+         This defaults to 'localhost', allowing only the localhost to connect
+         to the console ports.  Setting this to the empty string, allows all
+         hosts to connect.
          """
          return self.get_config_value('console-address', self.console_address_default)